merge
authorIan Campbell <ian.campbell@xensource.com>
Tue, 22 Aug 2006 17:48:00 +0000 (18:48 +0100)
committerIan Campbell <ian.campbell@xensource.com>
Tue, 22 Aug 2006 17:48:00 +0000 (18:48 +0100)

Trivial merge